From 0fc2ddf1f8adab778b3f39ebcca42c00617915a5 Mon Sep 17 00:00:00 2001
From: Hollis Blanchard <hollisb@us.ibm.com>
Date: Tue, 6 Feb 2007 13:42:19 -0600
Subject: [PATCH] [POWERPC][XEN] Move shared page location to public header to
 share with libxc. Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
 Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>

--HG--
extra : transplant_source : %AF%17%E1%F5%1D%23%B3%B3%1CF%B4%AC%F4%84%D3%A4s%EB%BB%F4
---
 xen/arch/powerpc/domain_build.c   | 1 +
 xen/arch/powerpc/mm.c             | 1 +
 xen/include/asm-powerpc/domain.h  | 7 -------
 xen/include/public/arch-powerpc.h | 8 ++++++++
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/xen/arch/powerpc/domain_build.c b/xen/arch/powerpc/domain_build.c
index f13186548a..ee95b2a1b6 100644
--- a/xen/arch/powerpc/domain_build.c
+++ b/xen/arch/powerpc/domain_build.c
@@ -30,6 +30,7 @@
 #include <xen/version.h>
 #include <asm/processor.h>
 #include <asm/papr.h>
+#include <public/arch-powerpc.h>
 #include "oftree.h"
 
 extern int parseelfimage_32(struct domain_setup_info *dsi);
diff --git a/xen/arch/powerpc/mm.c b/xen/arch/powerpc/mm.c
index 2a9499825a..ab83d09b55 100644
--- a/xen/arch/powerpc/mm.c
+++ b/xen/arch/powerpc/mm.c
@@ -28,6 +28,7 @@
 #include <asm/init.h>
 #include <asm/page.h>
 #include <asm/string.h>
+#include <public/arch-powerpc.h>
 
 #ifdef VERBOSE
 #define MEM_LOG(_f, _a...)                                  \
diff --git a/xen/include/asm-powerpc/domain.h b/xen/include/asm-powerpc/domain.h
index 50f999c281..367c90414c 100644
--- a/xen/include/asm-powerpc/domain.h
+++ b/xen/include/asm-powerpc/domain.h
@@ -107,13 +107,6 @@ extern void load_segments(struct vcpu *);
 extern void save_float(struct vcpu *);
 extern void load_float(struct vcpu *);
 
-#define RMA_SHARED_INFO 1
-#define RMA_START_INFO 2
-#define RMA_LAST_DOM0 2
-/* these are not used for dom0 so they should be last */
-#define RMA_CONSOLE 3
-#define RMA_LAST_DOMU 3
-
 #define rma_size(rma_order) (1UL << ((rma_order) + PAGE_SHIFT))
 
 static inline ulong rma_addr(struct arch_domain *ad, int type)
diff --git a/xen/include/public/arch-powerpc.h b/xen/include/public/arch-powerpc.h
index 9ef33c502c..add1d4ce2f 100644
--- a/xen/include/public/arch-powerpc.h
+++ b/xen/include/public/arch-powerpc.h
@@ -117,6 +117,14 @@ struct arch_shared_info {
 struct arch_vcpu_info {
 };
 
+#define RMA_SHARED_INFO 1
+#define RMA_START_INFO 2
+#define RMA_LAST_DOM0 2
+/* these are not used for dom0 so they should be last */
+#define RMA_CONSOLE 3
+#define RMA_STORE 4
+#define RMA_LAST_DOMU 4
+
 /* Support for multi-processor guests. */
 #define MAX_VIRT_CPUS 32
 #endif
-- 
2.30.2